fixed merging
authorAnja Bruls <anja@transceptor.technology>
Wed, 5 Dec 2018 15:28:09 +0000 (16:28 +0100)
committerAnja Bruls <anja@transceptor.technology>
Wed, 5 Dec 2018 15:28:09 +0000 (16:28 +0100)
commit98f6fa068291930879284f0699d4c8d9c41d9d25
tree62be37ece31078430f10be634aff4fe567af88fb
parentaded73528dbe9a23595f06d165e5797d8191ca37
fixed merging
111 files changed:
dbtest/.accounts.dat [deleted file]
dbtest/dbpath0/.accounts.dat [deleted file]
dbtest/dbpath0/anja/.dropped [deleted file]
dbtest/dbpath0/anja/.max_series_id [deleted file]
dbtest/dbpath0/anja/buffer.dat [deleted file]
dbtest/dbpath0/anja/database.conf [deleted file]
dbtest/dbpath0/anja/database.dat [deleted file]
dbtest/dbpath0/anja/groups.dat [deleted file]
dbtest/dbpath0/anja/series.dat [deleted file]
dbtest/dbpath0/anja/servers.dat [deleted file]
dbtest/dbpath0/anja/users.dat [deleted file]
dbtest/dbpath0/benchmark/.dropped [deleted file]
dbtest/dbpath0/benchmark/.max_series_id [deleted file]
dbtest/dbpath0/benchmark/buffer.dat [deleted file]
dbtest/dbpath0/benchmark/database.conf [deleted file]
dbtest/dbpath0/benchmark/database.dat [deleted file]
dbtest/dbpath0/benchmark/groups.dat [deleted file]
dbtest/dbpath0/benchmark/series.dat [deleted file]
dbtest/dbpath0/benchmark/servers.dat [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000000.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000001.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000002.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000003.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000004.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000005.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000006.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000007.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000008.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000009.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000010.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000011.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000012.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000013.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb [deleted file]
dbtest/dbpath0/benchmark/users.dat [deleted file]
dbtest/dbpath1/.accounts.dat [deleted file]
dbtest/dbpath1/benchmark/.dropped [deleted file]
dbtest/dbpath1/benchmark/buffer.dat [deleted file]
dbtest/dbpath1/benchmark/database.conf [deleted file]
dbtest/dbpath1/benchmark/database.dat [deleted file]
dbtest/dbpath1/benchmark/groups.dat [deleted file]
dbtest/dbpath1/benchmark/series.dat [deleted file]
dbtest/dbpath1/benchmark/servers.dat [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb [deleted file]
dbtest/dbpath1/benchmark/users.dat [deleted file]
dbtest/siridb-http.conf [deleted file]
dbtest/siridb0.conf [deleted file]
dbtest/siridb1.conf [deleted file]